Bump Xen interface version number to 0x00030201 for new

structural guest handles.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/ia64/Kconfig b/linux-2.6-xen-sparse/arch/ia64/Kconfig
index e71322028d156eb249528ccde53928b8586498ec..6bb58cb15fcc0801118ef352bc801716910732e2 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig
@@ -106,7 +106,7 @@ config XEN_SYSFS
 config XEN_INTERFACE_VERSION
        hex
        depends on XEN
-       default 0x00030101
+       default 0x00030201
 
 config SCHED_NO_NO_OMIT_FRAME_POINTER
        bool

diff --git a/linux-2.6-xen-sparse/drivers/xen/Kconfig b/linux-2.6-xen-sparse/drivers/xen/Kconfig
index 0595eb0028c3f8f51a4085cc28e0785685d19d4b..054e1397deb77e5af255cffe9f7e1d4edfc9d167 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig
+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig
@@ -13,7 +13,7 @@ config XEN
 if XEN
 config XEN_INTERFACE_VERSION
        hex
-       default 0x00030101
+       default 0x00030201
 
 menu "XEN"
 

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 49314d9fd720066e3bd3eaba22aac402ce3d5097..cd7793132c2d97f1320ba8abef8a57df38bf6e56 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -12,7 +12,7 @@ XEN_LIBXENSTAT     = $(XEN_ROOT)/tools/xenstat/libxenstat/src
 
 X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
 
-CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030101
+CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030201
 
 %.opic: %.c
        $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<

diff --git a/xen/include/public/xen-compat.h b/xen/include/public/xen-compat.h
index c4f235095d08cadaec8edb61a6260532c2ff5ced..ad8a1e1b438cfe39bc703f8e47cf0d10396b9d15 100644 (file)
--- a/xen/include/public/xen-compat.h
+++ b/xen/include/public/xen-compat.h
@@ -9,7 +9,7 @@
 #ifndef __XEN_PUBLIC_XEN_COMPAT_H__
 #define __XEN_PUBLIC_XEN_COMPAT_H__
 
-#define __XEN_LATEST_INTERFACE_VERSION__ 0x00030101
+#define __XEN_LATEST_INTERFACE_VERSION__ 0x00030201
 
 #if defined(__XEN__)
 /* Xen is built with matching headers and implements the latest interface. */
@@ -23,9 +23,17 @@
 #error "These header files do not support the requested interface version."
 #endif
 
+/* New sched_op hypercall introduced in 0x00030101. */
 #if __XEN_INTERFACE_VERSION__ < 0x00030101
 #undef __HYPERVISOR_sched_op
 #define __HYPERVISOR_sched_op __HYPERVISOR_sched_op_compat
 #endif
 
+/* Structural guest handles introduced in 0x00030201. */
+#if __XEN_INTERFACE_VERSION__ < 0x00030201
+#undef __DEFINE_XEN_GUEST_HANDLE
+#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
+    typedef type * __guest_handle_ ## name
+#endif
+
 #endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */